Allow dest to be NULL. (#464528, Xan Lopez)

2007-09-06  Matthias Clasen  <mclasen@redhat.com>

        * gdk/gdkrectangle.c (gdk_rectangle_intersect): Allow
        dest to be NULL.  (#464528, Xan Lopez)

svn path=/trunk/; revision=18742

diff --git a/ChangeLog b/ChangeLog
index 88559ba196462fb3ba803daae9a8cd7a6e4682d1..69e75cd14d9c630e5b1b5cd94d88435c540fa99d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,14 @@
-2007-09-06 Matthias Clasen  <mclasen@redhat.com>
+2007-09-06  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/gdkrectangle.c (gdk_rectangle_intersect): Allow
+       dest to be NULL.  (#464528, Xan Lopez)
+
+2007-09-06  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkmisc.c (gtk_misc_set_alignment, gtk_misc_set_padding): 
+       Actually emit change notification here.  (#474282, Thomas Rydzynski)
+
+2007-09-06  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooserdefault.c (shortcuts_drop_uris): Initialize
        error to NULL before calling g_set_error(). Should fix #473954, 

diff --git a/gdk/gdkrectangle.c b/gdk/gdkrectangle.c
index 71679f98f7fb76e34e863a5dfda25deb352f7c8f..c5e9dfcc377a9bb1b8d01436fa97976f7a6b00f9 100644 (file)
--- a/gdk/gdkrectangle.c
+++ b/gdk/gdkrectangle.c
@@ -62,12 +62,14 @@ gdk_rectangle_union (GdkRectangle *src1,
  * gdk_rectangle_intersect:
  * @src1: a #GdkRectangle
  * @src2: a #GdkRectangle
- * @dest: return location for the intersection of @src1 and @src2
+ * @dest: return location for the intersection of @src1 and @src2, or %NULL
  *
  * Calculates the intersection of two rectangles. It is allowed for
- * @dest to be the same as either @src1 or @src2. If the rectangles
- * doesn't intersect, @dest's width and height is set to 0 and its x
- * and y values are undefined.
+ * @dest to be the same as either @src1 or @src2. If the rectangles 
+ * do not intersect, @dest's width and height is set to 0 and its x 
+ * and y values are undefined. If you are only interested in whether
+ * the rectangles intersect, but not in the intersecting area itself,
+ * pass %NULL for @dest.
  *
  * Returns: %TRUE if the rectangles intersect.
  */
@@ -82,7 +84,6 @@ gdk_rectangle_intersect (GdkRectangle *src1,
 
   g_return_val_if_fail (src1 != NULL, FALSE);
   g_return_val_if_fail (src2 != NULL, FALSE);
-  g_return_val_if_fail (dest != NULL, FALSE);
 
   return_val = FALSE;
 
@@ -93,13 +94,16 @@ gdk_rectangle_intersect (GdkRectangle *src1,
 
   if (dest_w > 0 && dest_h > 0)
     {
-      dest->x = dest_x;
-      dest->y = dest_y;
-      dest->width = dest_w;
-      dest->height = dest_h;
+      if (dest)
+        {
+          dest->x = dest_x;
+          dest->y = dest_y;
+          dest->width = dest_w;
+          dest->height = dest_h;
+        }
       return_val = TRUE;
     }
-  else
+  else if (dest)
     {
       dest->width = 0;
       dest->height = 0;